Skip to content

Conversation

lnicola
Copy link
Member

@lnicola lnicola commented Oct 14, 2025

Subtree update of rust-analyzer to rust-lang/rust-analyzer@6d4b234.

Created using https://github.com/rust-lang/josh-sync.

r? @ghost

A4-Tacks and others added 30 commits August 30, 2025 18:58
Example
---
```rust
fn main() {
    let bar = Some(true);
    if true && bar.$0
}
```

**Before this PR**:

Cannot complete `.let`

**After this PR**:

```rust
fn main() {
    let bar = Some(true);
    if true && let Some($0) = bar
}
```
Add support for else-block of never-type for `convert_to_guarded_return`

Example
---
```rust
fn main() {
    if$0 let Ok(x) = Err(92) {
        foo(x);
    } else {
        return
    }
}
```

**Before this PR**:

Assist not applicable

**After this PR**:

```rust
fn main() {
    let Ok(x) = Err(92) else {
        return
    };
    foo(x);
}
```
Example
---
```rust
fn foo() {
    let x;
    if true {
        match true {
            true => $0x = 2,
            false => x = 3,
        }
    }
}
```

**Before this PR**:

Assist not applicable

**After this PR**:

```rust
fn foo() {
    let x;
    if true {
        x = match true {
            true => 2,
            false => 3,
        };
    }
}
```
internal: Build x86_64-apple-darwin binaries on macos-14
internal: Migrate inference to next solver
…nresolved

fix: Ignore impl trait safety errors when the trait is unresolved
This updates the rust-version file to 3369e82.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: 3369e82
Filtered ref: abf6c425d3a4688fd64d51be9adef24ec58e128b
Upstream diff: rust-lang/rust@f957826...3369e82

This merge was created using https://github.com/rust-lang/josh-sync.
Fix small things clippy was complaining about
…o-install

fix: Prevent rustup from automatically installing toolchains
ShoyuVanilla and others added 10 commits October 14, 2025 07:51
Add else-block support for convert_to_guarded_return
…gn-up

Fix not applicable match inside if for pull_assignment_up
```rust
fn foo() -> i32 {
    loop {
        $0
    }
}
```

**Before this PR**:

```rust
fn foo() -> i32 {
    loop {
        break;
    }
}
```

**After this PR**:

```rust
fn foo() -> i32 {
    loop {
        break $0;
    }
}
```
This updates the rust-version file to fb24b04.
Pull recent changes from https://github.com/rust-lang/rust via Josh.

Upstream ref: fb24b04
Filtered ref: 8d328b994c70dfeed12717a13a915703ec939cfc
Upstream diff: rust-lang/rust@3369e82...fb24b04

This merge was created using https://github.com/rust-lang/josh-sync.
@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 2025

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels Oct 14, 2025
@rust-log-analyzer

This comment has been minimized.

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 14, 2025
@rust-log-analyzer

This comment has been minimized.

@lnicola
Copy link
Member Author

lnicola commented Oct 14, 2025

@bors r+ p=1 subtree update

@bors
Copy link
Collaborator

bors commented Oct 14, 2025

📌 Commit 7d93599 has been approved by lnicola

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 14, 2025
@bors
Copy link
Collaborator

bors commented Oct 14, 2025

⌛ Testing commit 7d93599 with merge 844264a...

@bors
Copy link
Collaborator

bors commented Oct 14, 2025

☀️ Test successful - checks-actions
Approved by: lnicola
Pushing 844264a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 14, 2025
@bors bors merged commit 844264a into rust-lang:master Oct 14, 2025
12 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 14, 2025
Copy link
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing e100792 (parent) -> 844264a (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 844264adda6f41ca6d0d61c4bcac0f263fc5072f --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-apple-various: 2962.6s -> 4136.0s (39.6%)
  2. dist-arm-linux-gnueabi: 5131.9s -> 6173.2s (20.3%)
  3. i686-gnu-1: 7791.3s -> 6719.6s (-13.8%)
  4. aarch64-msvc-1: 7862.6s -> 6832.8s (-13.1%)
  5. x86_64-gnu-gcc: 3402.2s -> 2997.7s (-11.9%)
  6. x86_64-gnu-miri: 4504.4s -> 4013.4s (-10.9%)
  7. dist-various-1: 3849.4s -> 4255.7s (10.6%)
  8. x86_64-msvc-ext3: 6365.4s -> 6984.4s (9.7%)
  9. dist-aarch64-windows-gnullvm: 5163.8s -> 4743.0s (-8.1%)
  10. tidy: 192.4s -> 206.5s (7.3%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (844264a): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 2.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
2.6% [2.6%, 2.6%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) 2.6% [2.6%, 2.6%] 1

Cycles

Results (primary -2.2%, secondary 3.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
3.6% [3.6%, 3.6%] 1
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 473.51s -> 474.738s (0.26%)
Artifact size: 388.11 MiB -> 388.14 MiB (0.01%)

@lnicola lnicola deleted the sync-from-ra branch October 15, 2025 04:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.